Merge.
authorSteven Smith <ssmith@xensource.com>
Fri, 29 Sep 2006 14:40:35 +0000 (15:40 +0100)
committerSteven Smith <ssmith@xensource.com>
Fri, 29 Sep 2006 14:40:35 +0000 (15:40 +0100)
commite8c70336f370f684635a3a3350ad8e5d6c36daf2
treedacfcea5ce2d7633a94df707d0940ddaec482a7e
parent8f1fe8952783109d67cb1a66e4ea5d5dc5405d81
parentbb52a4e20add99e1fe64ece57f332114f46e4928
Merge.